Fixed supports (27/39)

Fixed supports