Bugfix for clustering animation
Merge commit '81a0baa'