hopefully correcting improper animations, goes with #26