fix #3 497b