Way easier to fix directly in entry, since prepareTableValue would require the same fix