Feature/fix 50