save the self object
Merge branch 'hotfix'