merging smbmnt fix from 3.0