Fix bug in Momentum