Fix crossfading to work properly