Fix/issue 26