patch from chinmaygarde@ to make progress on mac, ios.