fix momentum assignment