One last patch fix