Fixed Issue 2.