Initial fix with 10.9