Try to fixing some bugs