diff --git a/FlashCards_Service/src/main/java/org/robbins/flashcards/facade/impl/DefaultFlashcardFacade.java b/FlashCards_Service/src/main/java/org/robbins/flashcards/facade/impl/DefaultFlashcardFacade.java
index 11a2702af..1e3f24dfe 100644
--- a/FlashCards_Service/src/main/java/org/robbins/flashcards/facade/impl/DefaultFlashcardFacade.java
+++ b/FlashCards_Service/src/main/java/org/robbins/flashcards/facade/impl/DefaultFlashcardFacade.java
@@ -16,7 +16,6 @@
 import org.robbins.flashcards.model.FlashCard;
 import org.robbins.flashcards.model.Tag;
 import org.robbins.flashcards.service.FlashCardService;
-import org.robbins.flashcards.service.TagService;
 import org.robbins.flashcards.service.util.DtoUtil;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Component;
@@ -33,9 +32,6 @@ public class DefaultFlashcardFacade extends AbstractCrudFacadeImpl<FlashCardDto,
 	@Inject
 	private TagFacade tagFacade;
 	
-	@Inject
-	private TagService tagService;
-	
 	@Override
 	public FlashCardService getService() {
 		return flashcardService;
@@ -114,11 +110,11 @@ private Set<Tag> configureTags(Set<TagDto> tags) {
 			// if we don't have the id of the Tag
 			if (tagDto.getId() == null || tagDto.getId() == 0) {
 				// try to get the existing Tag
-				Tag existingTag = tagService.findByName(tagDto.getName());
+				TagDto existingTag = tagFacade.findByName(tagDto.getName());
 				
 				// does the Tag exist?
 				if (existingTag != null) {
-					results.add(existingTag);
+					results.add(tagFacade.getEntity(existingTag));
 				} else {
 					// tag doesn't exist, re-add the Tag as-as
 					results.add(tagFacade.getEntity(tagDto));
diff --git a/FlashCards_Service/src/test/java/org/robbins/flashcards/facade/impl/DefaultFlashcardFacadeUT.java b/FlashCards_Service/src/test/java/org/robbins/flashcards/facade/impl/DefaultFlashcardFacadeUT.java
index f0b92a92b..21ae93b62 100644
--- a/FlashCards_Service/src/test/java/org/robbins/flashcards/facade/impl/DefaultFlashcardFacadeUT.java
+++ b/FlashCards_Service/src/test/java/org/robbins/flashcards/facade/impl/DefaultFlashcardFacadeUT.java
@@ -110,10 +110,19 @@ public void save() throws ServiceException {
 		when(mockService.save(any(FlashCard.class))).thenReturn(mockFlashcard);
 		when(mockMapper.map(mockFlashcardDto, FlashCard.class)).thenReturn(mockFlashcard);
 		when(mockMapper.map(mockFlashcard, FlashCardDto.class)).thenReturn(mockFlashcardDto);
+		when(mockFlashcardDto.getTags()).thenReturn(new HashSet<TagDto>(Arrays.asList(mockTagDto)));
 		
 		FlashCardDto result = flashCardFacade.save(mockFlashcardDto);
 		
 		verify(mockService).save(any(FlashCard.class));
 		assertThat(result, is(FlashCardDto.class));
 	}
+	
+	@Test
+	public void getEntities() {
+		List<FlashCardDto> flashCardDtos = Arrays.asList(mockFlashcardDto);
+		List<FlashCard> results = flashCardFacade.getEtnties(flashCardDtos);
+		
+		assertThat(results, is(List.class));
+	}
 }