fix All bug I just created