Fixed small bug with return field