Fix automatic saving of position