fixed #633