Trying to fix annex handling