Fixing bugs one by one