Edit Dongle #1595