Temporary solution to crash bug on sample plate move - see issue 605