Fix crossfade