fix bug handler