Fixing fade bug