fixed issues with changed classloader