Add extra wraps to bugfix private cv layout