Fix empty of collection
Fix inscription
Merge pull request #1104 from nlegoff/fix-bugs

[3.8.4] Fix some bugs