Fixed supports (8/39)

Fixed supports