Applied patch from #324