Feature/fix issue 164