fix some fucking bug