Attempted fade and auto remove fix