right animation in all cases

Signed-off-by: Ruben Mendez <ruben.mendez@gmail.com>