Manually added some changes from #151.