Fixed Issue 2