solve the bugs