Possible fix for Wally / Re-use class instances in various other places.