Fix implicit return code issue