Made fade animation more robust.