Fixed Jessie's changes.
Merge branch 'elaksana-master'