Fixed support for references