Fixed #2: Error on restart