fixed #11,fixed #16