Bug fix with color