Bug fix for Duplicate tiles and more