Fixed bug in executorId check