Fixed OSGi