Fix for non-deliberate fall through

It got introduced when changing if/else into switch statements.