Applied suggested fix from RT #47628