Fixed supports (29/39)

Fixed supports