bug fixing II