DP Policies - button break fix