Fix user / group collecting