Feature/fix issue 77