Case and else fix