Possible fix for #359

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