Bill bug fix (3rd times the charm)