fix bug in List and Resolve