Fixes: #1965 gotomasses needs an updat