Fix according to eric's comments. Thanks !