fix #579