Fix for the OSGI conflict