Fixed a few bugs with the current implementation of double animation