FIX: Fix the Yosemite fix