#2 issue resolved