Partial fix for #2917