Fixed bad design