BS-11328 - Fix classloader issue