fix #555