Crossfade fix