diff --git a/epydial/epydial.py b/epydial/epydial.py
index 40ad753..cb75c3a 100755
--- a/epydial/epydial.py
+++ b/epydial/epydial.py
@@ -126,7 +126,7 @@ class MainScreen(EdjeGroup):
 	@edje.decorators.signal_callback("dialer_send", "*")
 	def on_edje_signal_numberkey_triggered(self, emission, source):
 		if self.res['code'] != 'READY':
-			if len(self.text) < 4 and source in ("0", "1", "2", "3", "4", "5", "6", "7", "8", "9"):
+			if len(self.text) < 4 and source.isdigit():
 				self.text.append(source)
 				print ''.join(self.text)
 				self.part_text_set("numberdisplay_text", '*' * len(self.text))
@@ -143,7 +143,7 @@ class MainScreen(EdjeGroup):
 				self.part_text_set("numberdisplay_text", "please dial")
 				self.text = []
 		else:	
-			if source in ("0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "#", "*"):
+			if source.isdigit() or source in ('*', '#'):
 				self.text.append(source)
 				print ''.join(self.text)
 				self.part_text_set("numberdisplay_text", "".join(self.text))