Fix mass locks - closes #103