Fero Hotfix Task 2