Also having this issue! It’s a huge pain!