Fixing defect 18&19 for design intro 1.2