Fix overflow issue, only apply transitions and transformations during collapse