Original Game bug fixing