Another possible fix for issue #114