(Hopefully) fix lock saving