SWC-1040: fix long reference layout
Merge pull request #808 from jay-hodgson/SWC-1040

SWC-1040: fix long reference layout