Manual change as per patch in mantis #7212. (the patch failed to apply, but the fix was good) Thanks FreakyTech.