Fix up/down hisotry cycle