fixed #683