Fixed setting geom field when it's not the last field