fixed #71,fixed #70,fixed #69