Fixed issue with even numbers