fix #7 & #6