OBMFULL-6103 Fix Guice issue