Fixed factory bean resolving