apply changes from #43