Recovering changes from #48