Fixing one bug at a time