Feature/fix issue 163