Possible fix for restart issues (#28)