Issue 62

fix #62