Found some bugs