Feature/fix issue 177