fix issues with batch input