Removed redundant wrapper