Try to fix edge-case assert
Refactor calculateForce skipping