Updates and retry

Fixed in 75f3c15