Patch fix null