Updated as per Xavier comment