fixing Issue #2
fixed Issue #1