Pri: solved defects