fixed #684