Fix classloader issue