Fixed auto wrapping issue