last fix for up/down