SegmentTemplate bug fixed - already a push request but I need it now