fix #15 & #16