QuadBatch refactor
Fix