Exposed bug 417 (and 408?)