I fixed one of my locks today, simply unscrewed the button from the lock shaft and found it was covered in a sticky substance at the base. I cleaned it off, screwed it back on and it's fine. The other one is perhaps a different issue as that's still the same.