More fixing for fade-outs.