fixed #1018