Merge pull request #116 from glenwks/master

fix bug id 67610838 on pivotal tracker