Fix the return value