Fix support for disabled export