Issue 1:

Issue 2: