Noticed some bugs