Bugfix and Restart

See commit comments for details