Feature/fix issue 156