Fixed class injection