Revert "move logic is not executed if selection logic is"

This reverts commit b77a23c7429317a9982fa263f7353e65f4c04e39.
Torpedo msg fix