MDL-24332 fixed incorrect fix - credit goes to Steve Massicotte