fixed #6 and #7