Bug fix with attribute loading