Fix UP/DOWN logic a bit.

Maybe UP/DOWN handling should be removed completely.