improve fix #53