Issue #8273 by cableman: Updated module code to match ding2