Removed redundant wrapping function