Removed double wrap