Fix issue with Bastion