Fix for runner overloading