Feature/fix issue 67