Yeah, passing the `object` around was quite messy. Thanks for the fix.