Fixed Moving/Fixed problem
Merge origin/master