Yep, it'd be nice to fix this