Feature/fix issue 182