Corrected for ISSUE-68
Corrected typo for ISSUE-69