fixed Kirill's comments