Applied patch from @kevinhikaruevans