Fix for Call-time pass-by-reference