Feature/fix issue 70 2