Fixed supports (20/39)

Fixed supports