Fix status by Fabien Dupont