Fixed supports (26/39)

Fixed supports