Quick update/fix on unreachable code