Added comment to identify issue 18 and 13 in the fix.