Applied patch from @JaredF