Rolled back as navigation was jumping