fix same design bugs