Added magic to fix wrapping