Flat Responsibility lockId fix.