Incorporated track color fix from upstream