Fixed Issue 8