fixes to the returned result