Fixed Issue-#2