Feature/fix issue 157