Fix for attributes