Fix for #958