Partial fix for #13