Fixing island problem