Hotfix change added. 

This is from hotfix to master.