Fix animation and count checking