fix loading from modules and batches