Fixed fall through bug