Fixed issue with fade