Fixed some null color support