Fixed Issue-#1