Popup jump fix backup

At the moment this is just to see exactly what was changed.