Another possible fix for #246

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