Add workaround for unitialized proxy classes