Oops. Proper fix for #470.