fix #542