Added workaround for Guice issue 847