Fixed supports (18/39)

Fixed supports