Board Thread:Code Review/@comment-28083312-20170109130832/@comment-29826282-20170109133647

Edit: Slight change.