Any progress here? Or at least a workaround?