Fixed upsert() function