Rebuilds lock mechanism during drag

#394