made executor more robust