Resolve Issue 362