fix undefined index warning
Merge branch 'tmpFix' into 3.7