fix #547