urgent fix for #1138