Fixed handleIf