Removed bug fix which was already commented out