Patchwork fix for fall damage issue