Fix island problem