Fixed userattributes crash
merge conflicts