Fix for deprecated call-time pass-by-references