Fixed OSGI