Fixed supports (30/39)

Fixed supports