Fixed supports (24/39)

Fixed supports