Fix issue using blocks with else statements