Fixed Issue 17