Temporary attribute fix