Fixed return error?