fixed autowiring issues