Quick design fix