I'm assuming the OP editing issue still exists. That would also be a welcome fix while you're under the hood.