fix CNFE throwing (hack)
ClassNotFoundException fix