Fix for the return type and function return.