Fix Github #545
Merge pull request #547 from siyuanh/telecom

Fix Github #545