On branch master (milestone)

- fix the tiling bug