Avert potential problems

Not sure what the default behavior is, but I want to make sure that
anything previously there is overridden.