Fixed bug with Non fast-forward updates