Fix issue w/ assigning colors