Small patch fix for new upstream version