Removed incorrect optimization