issue fix #2