fixed #615