issue #39, improving UX