Complete fix for UserTileChanger