Partial fix for ff/rw resume issues