Correct issue with last merge (blah box)