partial fix for #2136