SWC-1040: fix long reference layout