Fix from bad merge