Rerun, closes: #42