Fix incorrect returned key when creating new geometry