Issue #1 fix
Issue #2 fix.