fix for cmmotion