fix up issue #78 #79

please review