Fix for master compatibility