Fixes some animation issue