Fixed bug #4130 which created wrong move events