Tweak to ensure animations don't get stuck betwixt states