Fixed incompatibility with recent version of dagger