Fixed supports (15/39)

Fixed supports