fix lock and load