Fixing issue #1 and #2

Fixing issue #1 and #2