[RFR] Fix design