fixed #556