Cleaned up mashed nil attributes causing problems