fixed #16 #15