Fix expansion of islands