maybe fix for #1223