Edit Dongle #1621