partial fix for cdma