Fix/issue #2