Possible fix for move toward bug