fixed #4,#5