Hotfix/issue#3