Customers might not be able to walk into an Apple Store and pick up an Apple Watch off the shelf just yet, but improved yield rates from Apple’s supply chain may help fix that.

Quanta vice chairman CC Leung revealed on Friday to Digitimes that despite earlier hurdles, the production of its client’s wearable device was no longer a problem for the company.

“Because of labor shortages during the Lunar New Year holidays, Quanta was forced to borrow manpower from other manufacturers and was only able to deliver limited shipments in the first quarter,” Leung told Digitimes. “However, Quanta already has sufficient capacity to manufacture all the orders and should see a giant contribution from its wearable device business in the second quarter.”

Though Leung didn’t identify Apple or the Apple Watch by name, the company has been widely reported as the manufacturer of the smartwatch.

Since the Apple Watch went on sale in April, supplies have gradually improved as customers saw increased deliveries through May for some models. However, certain models, especially the larger 42mm version, continue to see shipping times as far as July.

Officially, Apple hasn’t said publicly when it plans to have the Apple Watch in-store. But according to an internal memo, online-only orders are expected to continue through May.