Fix to avoid set fault