Solid Design Fix