Fixes bug causing wrong commands generated for batch components