Oops, bug change is one thing.

cbugg: closes bug-300