Condition on uid added fixed