fixing potential class loading issue with plugin.