Fix for sampleattributes