Fixed return object