Fixed supports (25/39)

Fixed supports