#380 lot indexing fix