Bring back correct value check