continue clean and up support for wrap range