fix for batch submission