Fixing smoke as per changes on role screen