Fix Color lock problem