Refixed

Fixed what we discussed at lunch.