Issue #4145 by Henry: Work on the prefix animation issue