Fix save current behaviour on load