Edit Dongle #1630