Fix bug.
Merge remote-tracking branch 'simpleg/master'