Fixed supports (22/39)

Fixed supports