Repair for 21.4 and the read-only attribute