fix for restart feature