Fixed support for constant records