Partial fix for #926