Fixed Issue #6,#7