Little bug fix and Animation class