fixed #598