fixing the return value