Fixed return data bug