Fix statement not reachable issue