fixed #528