Issue #2 fix

Done from phone