Issue #12 lifted