Fixed upsert always seems to return true