2D bug fix: correct cylinder mask and forces