fixed on-demand loading
update version