Fixing color issue