trash fix
Merge branch 'hotfix/trashfix'