Don't liek dis but ok - still we need to handle the restart