fix attr crash, merge with attr stuff