further bugproofing