Fixed bugs # 1804016 & # 1804010
Fixed bugs # 1804016 & # 1804010

bobrock/vesuvius,sahana/vesuvius,sahana/vesuvius,bobrock/vesuvius,sahana/vesuvius,ramdesh/vesuvius_installer,bobrock/vesuvius,bobrock/vesuvius,ramdesh/vesuvius_installer,sahana/vesuvius,ramdesh/vesuvius_installer,ramdesh/vesuvius_installer,sahana/vesuvius,bobrock/vesuvius,bobrock/vesuvius