Fix/issue 7