Fixed buggy animations