More code that should have been in the last patch.