Fixed else conditions