Fix unnecessary condition checking