Bug fix in list + separate transition in two steps