Use new jump detection mechanism