Fix issue that prevented parallel exec in certain cases