fixed #291, initial wrapping support