Fix up - for OTA