fixed Matei's comments