change for fix #22