BS-9870, fix classloader issue