024 - Hotfix on frontend