Fixed final (hopefully) error caused by removing shields