fix for mobile data (ported from CM)