fix #6 and #7