correct non else branches