Fix for hardware import. Not tested.