Issue #6 - fix