Fixed return function