fix #516