fixed #16 #18