Applied the patch from Robert