fix issue #70 work on issue #18