Discovered some bugs