fixing animation which was lost in merge