Feature/fix 80