fix color handling