Fix attribute key handling.