Fixed issue with batch sizes