fix #6 fix #7

missing commit