Address @trustin ' s comments