Feature/fix issue 129