Example fix + debug output changes