Fixed Issue 3