Another fix for the address sanitizer problem.

Hopefully that will do it...