MB-146 #Fixed duplicate entry creation