fixed bug (freeze) when clicking next/prev. batch