Quick fix for newest changes