Fixed another error caused by removing the shield