fix the design problem