fixed first error in #220
fixed second issue in #220
typo fixed according to #220