fix #559