fixbug better