Hotfix issue122

gogo