Fixing bugs one at a time