Fix for #952