Fixed wrapping bug