Fix for bugzid 3833

Same fix as in 2013.07