Final design fix.