Fix support for Segment objects