Commented out asserts for v4.1