Feature/fix fade

Fixes fade issue