US632 - attempt to fix field id issue when encrypted