Added missed part from my prev. commit.