Another possible fix for Baseline