Fix - Fix logic error