fixed #1088 fixed #1090