Fixed issue where incomplete me object is being used