Fix for unnecessary condition