Fix for Issue 2 & Issue 4