fix 'double load' while animation loading, minor refactor