proper fix #9 and #10