Fix for #59