Issue #6 fixed