Fix fast movement conflict [close #2]