MDL-21577 fixed regression, thanks James Gheel for the patch