Integrate first comments of Cezary.