fix tile iterator issue
merge