Fixed animation bugs