Updated according to edit suggested -[skip ci]