deal some bugs