backward fit of 1.4.5 change
#220

Missed a line in 3d67016592e1edb9fd589af160d36916d1ffd352
Merge branch 'New-changes' into 1.4.5