Alejandro Roundtree lock-fix9108