Added chandlers suggested change (post #38701278)