Another possible fix for #27