#20:  fixing typo and typing issue