attempting fix for deadlock issue