Wrapper workarounds