Issue #11 lifted