use vrurg`s patch from #1