Fix for #969