Fix for broken inter-client part move feature