Fix for #6463