Removed an incorrect optimization