Fix for lion
Should not be ML specific