 Please review, potential fix for conflict with dot-controller.
Please review, potential fix for conflict with dot-controller.