Fix bundle masks