Fix "unreachable" return issue