Apr 15 patch fix