Potential fix for transient class loading bug