Resolve Issue 6