mass finder fixes
mass finder fixes