Fixed Issue 9