Attempting to fix 10.6 support