Fix for Shield