fixng isses #72 and #73