Fixed problems with span wrapping