Fixed supports (21/39)

Fixed supports