fixed #533