Strengthened restart task

Fixes #27