Applied patch from #14