fix #521