Animation Bug Fix