Take Alan's Comment, to Address Issue #294