RT# 82092 - added field validation