Fixed strange swap of position