Thread safe dirty fix