fixes #4: now with more restartless