Hotfix/caller memory issue

This fix an issue created with #176