another change that might help #3181