Fixed the unexpected flattening of 'geometry'?