added temporary fix to undefines in various fields