Resolve Issue 16