Removed unnecessary last condition