Fixed Non-Fast Forward Bug