Fixes some problem with animation
Solves merge conflict