Fixed falling through case statement