Follow up to : b7659e6