Fixed dead locks