This change could probably use a test. I can write one if you want.