Fixed supports (9/39)

Fixed supports