Fix #11594
Merge pull request #11598 from ZDroid/customizer-breaks

Fix #11594