Fix defaults handling with AR 3.2