fixes #958
revert that overflow
Merge branch 'master' into trash_smartdocs