Another possible fix for 1396