ISSUE: 146

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