wrap fix and syntax