Fixed fast-forward for some cores