Fixed Issue 5