Fix for BATCH-1767

Hello,
Here is a fix for BATCH-1767, this is a blocker one for a project, I hope you can take it into account soon.

Note I have registered this day as SpringSource Community Contributor.
Regards
Philippe M.