Feature/fix issue 192