issue116 fixed error and solved issue152