merged for fix #7