Simple design fix