code review honovation/ljmall#1006