Missed some updated code lines in last commit.
Authored by: harm10 2016-02-09
Parent: [r4471]
Child: [r4473]