ISSUE-140

https://github.com/andytruong/at_base/issues/140