State fix from Fabien