Address @trustin's comments