Fixes event word wrap
Merge fix