fixed #527