MDL-25031 fixed question ugprade - credit goes to Mark Nelson