Workaround for the animating problem