Fixed invalid object id as well