fixed typo and address bug