Merge pull request #550 from fabik111/fix-for-cellular-connectivity

Merge pull request #550 from fabik111/fix-for-cellular-connectivity #1336