fixed #538