Hotfixed shields to a working state