Fixed problems with color filling