Fix restart handler