Removed bug check