Feature/fix issue 125