Wrapper should be working better now.