Fix OSGI issue