Fixed supports (16/39)

Fixed supports