fixed inconsistencies with the objects get_or_create returns