Fixing bugs in conditions animations