Fix keys and attributes consistent behavior.