Fixed Wrapping Issue