This might be the "right way" to fix the issue - mark our exported classes as