a not-perfect fix for #468