Apply changes from #48