Quick fix for fast-forward