fixed #559