Fixed the defects