Deadlock fix?

Signed-off-by: Mark Farrell <m4farrel@csclub.uwaterloo.ca>