fix some animation issue