Fixed supports (17/39)

Fixed supports