re-fix #507