In a bid to turnaround repairs more quickly, Apple will now fix broken MacBook keyboards in its retail stores. Previously, it had been sending out the computers to off-site repair centers.

“Most keyboard-related repairs will be required to be completed in store until further notice,” an Apple internal memo obtained by Macrumors reads. “Additional service parts have been shipped to stores to support the increased volume. These repairs should be prioritized to provide next-day turnaround time. When completing the repair, have the appropriate service guide open and carefully follow all repair steps.”

The issues with Apple’s so-called butterfly keyboards—available in various generations across its MacBook, MacBook Pro, and MacBook Air laptops—are legendary and are clearly endemic. In March, Apple took the rare step of apologizing about the ongoing issues. And this more recent change is clearly designed to address a big side-issue for anyone experiencing keyboard problems: The repairs simply took too much time: three to five business days, and sometimes longer.

Now, however, Apple can turnaround a keyboard repair by the next day. This should be less frustrating for customers, though there’s no guarantee that the same problems won’t simply happen again and again. After all, the butterfly keyboards are terribly designed, and Apple, not coincidentally, now faces at least three lawsuits for the broken design.

If you do own a broken butterfly keyboard-based MacBook, you can schedule a free repair at Apple’s Get Support website.