Fix for #5