revised base on Marco's comment