Add wraps to bugfix private cv layout