Issue #5 fixed