PROBCORE-485 Try to fix some bugs in the animator selector & current trace to fix the mystery bug