possible fix for a deadlock issue 531.