Issue #94: fixing removing restrict issues