Another design fix