Removed some duplicated logic regarding fading.