will fix issue #39 web #41 is solved