fix #574