With the rumored iPhone 6 launch rapidly approaching it’s time for Apple to start mass producing its new smartphone. One weak spot may have threatened the handset’s release schedule but, according to a new report out of China, the Cupertino company may have solved its battery issue with a little help from to Taiwanese supplier Simplo.

Apple is reportedly looking for an extremely light and thin battery to use for the iPhone 6, and the company’s recent manufacturing partner Dynapack apparently couldn’t meet those demands. Apple has allegedly tapped Simplo and Desai to replace Dynapack and supply batteries. Apple worked with both Dynapack and Simplo when both firms produced batteries for the iPad 3.

It looks like Apple won’t have any trouble finding batteries for the iPhone 6, though the upcoming smartphone may face a few other production hurdles on its way to launch. According to KGI Securities analyst Ming-Chi Kuo, the company may also have trouble sourcing the larger touch panels and metal casings needed for its new smartphones. Kuo predicts this could delay the 5.5-inch iPhone 6, which was expected to launch alongside its 4.7-inch brother this fall.

Apple may be ironing out serious growing pains as it attempts to jump from the 4-inch iPhone 5s to significantly larger models this year. Hopefully the company can secure the parts it needs, or Apple fans desperate for a bigger iPhone may have to wait even longer than excepted.