Reference last, actually did the fix

Ref 429668e