Issue #3 fixed