Reinstantiated Abigail's chagnes of fa3f2c8c83d943086a0260d5b5829be69a6e555f in Position.pm #1970