Issue #50 - final fix