fix #557