fix #528