Made it more compatible to non-LTE device