Nicholas Gillette lock-fix9982