Fix for #44