Hopefully, this gets resolved soon