Long fields fix