Fixed Animation issues