fix issues that using lists