Attempt to fix #211, still to busy to test.

Signed-off-by: Ross Allan <rallanpcl@gmail.com>