maybe fix for #1377, needs testing on dedicated