@Amelia you or someone else on Team Sharkey really want to pull the fix for this in from upstream asap