fixing Inject and wrong entity usage