Fixed supports (13/39)

Fixed supports