HandlingFixes | Nextwald