issue #6 solved