fixed #1079