Cap batch locations

Fix for issue #682