Fixed custom attribute handling.