A bit of a hack, but fixes bug where derived Whens weren't being honored.