Revert "Revert "minor bugfix""

This reverts commit ffae4d04bc8ef27a50c8c6eee7115fcba9389656.
Revert "removed collision from cm, continue doesn't reset"

This reverts commit 6550899cfad9c2d91b8068add1da1c52adee4f66.