Fixed Tomari-mura handling