Fix firing of Finished event when moving