Removed some bugs, but the big one persists