trying to fix annex handling