Feature/fix issue 134