change from simon
Merge pull request #1 from AChusuei/alan-fix1

Simon's change