Check that also in wrap()