Fixed Issue #5-#7